Merged from trunk
authorJason Rumney <jasonr@gnu.org>
Wed, 27 Jan 2010 13:15:40 +0000 (21:15 +0800)
committerJason Rumney <jasonr@gnu.org>
Wed, 27 Jan 2010 13:15:40 +0000 (21:15 +0800)

Trivial merge